Auto merge of #4181 - gilescope:patch-1, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 19 Jun 2017 14:09:30 +0000 (14:09 +0000)
committerbors <bors@rust-lang.org>
Mon, 19 Jun 2017 14:09:30 +0000 (14:09 +0000)
commitae4124859411cc7db36d2b07ea9fba7068a43b36
treec347bba7cc72b26c9e7f2de07f93e663ae6bad89
parent77877412426503635b0bd13e1fb92f48b5c5cfb4
parent95691064b6f9a73287ad6b609f29945ab17a2e0a
Auto merge of #4181 - gilescope:patch-1, r=alexcrichton

Make test less brittle prior to assert_eq failure message format change

PR required for rust-lang/rust#42541 to make assert_eq error message be multi-line. Before implementing this we need to make the current test less brittle.
Not 100% clear on if I need the final [...] or not.